From 66d2c9e6fa20a5f676d9ad6957a5d9c93fcca300 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 5 Nov 2015 08:18:38 -0500 Subject: [PATCH] Adwaita: Update stack sidebar styling We no longer use the .sidebar-item style class. --- gtk/theme/Adwaita/_common.scss | 20 +++++++++++--------- gtk/theme/Adwaita/gtk-contained-dark.css | 12 ++++++------ gtk/theme/Adwaita/gtk-contained.css | 12 ++++++------ 3 files changed, 23 insertions(+), 21 deletions(-) diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss index cdbfd137a7..f48dd78511 100644 --- a/gtk/theme/Adwaita/_common.scss +++ b/gtk/theme/Adwaita/_common.scss @@ -2941,15 +2941,17 @@ GtkPlacesSidebar.sidebar { } } -.sidebar-item { - padding: 10px 4px; - > label { - padding-left: 6px; - padding-right: 6px; - } - &.needs-attention > label { - @extend %needs_attention; - background-size: 6px 6px, 0 0; +stacksidebar { + .list-row { + padding: 10px 4px; + > label { + padding-left: 6px; + padding-right: 6px; + } + &.needs-attention > label { + @extend %needs_attention; + background-size: 6px 6px, 0 0; + } } } diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css index 19b7d02444..bc34cdff09 100644 --- a/gtk/theme/Adwaita/gtk-contained-dark.css +++ b/gtk/theme/Adwaita/gtk-contained-dark.css @@ -964,15 +964,15 @@ button, headerbar button.titlebutton, .titlebar .primary-toolbar button.titlebutton { icon-shadow: none; } -.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, .sidebar-item.needs-attention > label { +.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, stacksidebar .list-row.needs-attention > label { animation: needs_attention 150ms ease-in; background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#3583d5), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.45, to(rgba(0, 0, 0, 0.81176)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 2px; } - .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, .sidebar-item.needs-attention > label:backdrop { + .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, stacksidebar .list-row.needs-attention > label:backdrop { background-size: 6px 6px, 0 0; } - .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) { + .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar .list-row.needs-attention > label:dir(rtl) { background-position: left 3px, left 2px; } .inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton, @@ -4124,12 +4124,12 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row { .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image { opacity: 0.7; } -.sidebar-item { +stacksidebar .list-row { padding: 10px 4px; } - .sidebar-item > label { + stacksidebar .list-row > label { padding-left: 6px; padding-right: 6px; } - .sidebar-item.needs-attention > label { + stacksidebar .list-row.needs-attention > label { background-size: 6px 6px, 0 0; } /**************** diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css index 2e5f5fb17c..1c085eb8b9 100644 --- a/gtk/theme/Adwaita/gtk-contained.css +++ b/gtk/theme/Adwaita/gtk-contained.css @@ -964,15 +964,15 @@ button, headerbar button.titlebutton, .titlebar .primary-toolbar button.titlebutton { icon-shadow: none; } -.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, .sidebar-item.needs-attention > label { +.stack-switcher > button.needs-attention > label, .stack-switcher > button.needs-attention > image, stacksidebar .list-row.needs-attention > label { animation: needs_attention 150ms ease-in; background-image: -gtk-gradient(radial, center center, 0, center center, 0.5, to(#4a90d9), to(transparent)), -gtk-gradient(radial, center center, 0, center center, 0.5, to(rgba(255, 255, 255, 0.76923)), to(transparent)); background-size: 6px 6px, 6px 6px; background-repeat: no-repeat; background-position: right 3px, right 4px; } - .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, .sidebar-item.needs-attention > label:backdrop { + .stack-switcher > button.needs-attention > label:backdrop, .stack-switcher > button.needs-attention > image:backdrop, stacksidebar .list-row.needs-attention > label:backdrop { background-size: 6px 6px, 0 0; } - .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), .sidebar-item.needs-attention > label:dir(rtl) { + .stack-switcher > button.needs-attention > label:dir(rtl), .stack-switcher > button.needs-attention > image:dir(rtl), stacksidebar .list-row.needs-attention > label:dir(rtl) { background-position: left 3px, left 4px; } .inline-toolbar toolbutton > button, .inline-toolbar headerbar toolbutton > button.titlebutton, @@ -4296,12 +4296,12 @@ GtkPlacesSidebar.sidebar .sidebar-new-bookmark-row { .sidebar-button.button:not(:hover):not(:active) > image, .sidebar-button.button:backdrop > image { opacity: 0.7; } -.sidebar-item { +stacksidebar .list-row { padding: 10px 4px; } - .sidebar-item > label { + stacksidebar .list-row > label { padding-left: 6px; padding-right: 6px; } - .sidebar-item.needs-attention > label { + stacksidebar .list-row.needs-attention > label { background-size: 6px 6px, 0 0; } /**************** -- 2.30.2